From 7b6235ce627e9abac6c7ea34b9560935ad56483d Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Fri, 5 Nov 2021 13:01:00 -0600
Subject: [PATCH] add fedora 35 to CI. (#756)

---
 .github/workflows/fedora.yml |  3 ++-
 tools/Dockerfile_f35         | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 tools/Dockerfile_f35

diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
index 9e325136a..b4e517158 100644
--- a/.github/workflows/fedora.yml
+++ b/.github/workflows/fedora.yml
@@ -17,7 +17,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['32', '33', '34']
+        # version 32, though obsolete, uses Qt 5.14 so we keep it for that.
+        version: ['32', '35']
     container:
       image: gpsbabel-docker.jfrog.io/tsteven4/gpsbabel_build_environment_f${{ matrix.version }}
       env:
diff --git a/tools/Dockerfile_f35 b/tools/Dockerfile_f35
new file mode 100644
index 000000000..2ba2d7883
--- /dev/null
+++ b/tools/Dockerfile_f35
@@ -0,0 +1,22 @@
+# this file is used to build the image gpsbabel_build_environment used by travis.
+
+FROM fedora:35
+
+LABEL maintainer="https://github.com/tsteven4"
+
+WORKDIR /app
+
+# basic tools to build
+RUN dnf install --assumeyes git make valgrind diffutils which findutils langpacks-en && \
+    dnf clean all
+# libraries used by gpsbabel.  zlib and shapelib may or may not be used depending qmake options.
+RUN dnf install --assumeyes libusb1-devel zlib-devel shapelib-devel && \
+    dnf clean all
+# Qt used by gpsbabel, gpsbabelfe
+RUN dnf install --assumeyes qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebengine-devel qt5-linguist qt5-qttranslations && \
+    dnf clean all
+# tools to build the docs
+RUN dnf install --assumeyes expat desktop-file-utils libxslt docbook-style-xsl fop && \
+    dnf clean all
+# create a link as fedora uses the name qmake-qt5 for Qt5's qmake.
+RUN alternatives --install /usr/bin/qmake qt /usr/lib64/qt5/bin/qmake 100
-- 
2.30.2